bitkeeper revision 1.1068 (40f2bd236qdLHUh6BZA_h_brBDxINw)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Mon, 12 Jul 2004 16:32:35 +0000 (16:32 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Mon, 12 Jul 2004 16:32:35 +0000 (16:32 +0000)
Merge ssh://xenbk@gandalf.hpl.hp.com//var/bk/xeno-unstable.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

1  2 
tools/python/xen/xend/XendClient.py

Simple merge